-
Notifications
You must be signed in to change notification settings - Fork 644
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Make rubber rounds printable in NFSD Techfab #1474
Merged
dvir001
merged 1 commit into
new-frontiers-14:master
from
whatston3:2024-06-05_nfsdfab-rubber-ammo
Jun 7, 2024
Merged
Make rubber rounds printable in NFSD Techfab #1474
dvir001
merged 1 commit into
new-frontiers-14:master
from
whatston3:2024-06-05_nfsdfab-rubber-ammo
Jun 7, 2024
+45
−5
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dvir001
approved these changes
Jun 7, 2024
FrontierATC
added a commit
that referenced
this pull request
Jun 7, 2024
blueDev2
added a commit
to blueDev2/frontier-station-14
that referenced
this pull request
Jun 11, 2024
commit c7d7e7b Author: FrontierATC <zuuswa@gmail.com> Date: Tue Jun 11 22:04:03 2024 +0000 Automatic Changelog (new-frontiers-14#1437) commit 0937fac Author: Dvir <39403717+dvir001@users.noreply.github.com> Date: Wed Jun 12 01:03:34 2024 +0300 Cats Carp Suit (new-frontiers-14#1437) * SuitUp * Fix * Fix * Update pets.yml * Update pets.yml * Update pets.yml * Update pets.yml commit 27356d5 Author: FrontierATC <zuuswa@gmail.com> Date: Tue Jun 11 19:18:08 2024 +0000 Automatic Changelog (new-frontiers-14#1500) commit f2076bb Author: TsjipTsjip <19798667+TsjipTsjip@users.noreply.github.com> Date: Tue Jun 11 21:17:43 2024 +0200 Pen signing rework (new-frontiers-14#1500) * Port pen signing from Sector-Umbra/Sector-Umbra#47 * Remove stampedBorderless references in maps from old signing system * Remove the existence of PenComponent commit 4d053b7 Author: FrontierATC <zuuswa@gmail.com> Date: Tue Jun 11 18:52:32 2024 +0000 Automatic Changelog (new-frontiers-14#1487) commit 3d61b18 Author: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com> Date: Tue Jun 11 21:52:05 2024 +0300 Construction Bag (new-frontiers-14#1487) * initial commit * Un Tag * fixes * no tickets * research thingy * inflatable walls, shared.comp --------- Co-authored-by: Dvir <dvirf01@gmail.com> commit df97e8b Author: FrontierATC <zuuswa@gmail.com> Date: Tue Jun 11 18:12:07 2024 +0000 Automatic Changelog (new-frontiers-14#1491) commit 4839227 Author: Whatstone <166147148+whatston3@users.noreply.github.com> Date: Tue Jun 11 14:11:38 2024 -0400 Loadouts: add overrides for name, description, and preview entity (new-frontiers-14#1491) * Add loadout name, desc, preview entity overrides * Fix for nullable fields * Add survival box * Update survival.yml * More edits --------- Co-authored-by: Dvir <dvirf01@gmail.com> commit 32df6dc Author: FrontierATC <zuuswa@gmail.com> Date: Mon Jun 10 15:37:29 2024 +0000 Automatic Changelog (new-frontiers-14#1497) commit 328edff Author: GreaseMonk <1354802+GreaseMonk@users.noreply.github.com> Date: Mon Jun 10 17:37:03 2024 +0200 Fix artifact fragment spawn rate (new-frontiers-14#1497) commit a120ab2 Merge: d4b5016 2707d95 Author: GreaseMonk <1354802+GreaseMonk@users.noreply.github.com> Date: Mon Jun 10 10:51:22 2024 +0200 Merge pull request new-frontiers-14#1431 from dvir001/2024-05-28-HTNSystem Update HTNSystem.cs commit d4b5016 Author: FrontierATC <zuuswa@gmail.com> Date: Sun Jun 9 17:53:33 2024 +0000 Automatic Changelog (new-frontiers-14#1214) commit 55c772f Author: Tych0 <151581207+Tych0theSynth@users.noreply.github.com> Date: Sun Jun 9 18:53:08 2024 +0100 NSF Broadhead (New) - Medium Detective NSFD Vessel (new-frontiers-14#1214) * Adds the NSF Broadhead, a new medium size detective-oriented NSFD shuttle. * Update Broadhead after review * Removed old files after relocating them to the correct dir * Security thrusters/gyro are now NFSD versions * Updates to new prototype names * Made requested changes and some other stuff --------- Co-authored-by: Maxtone <124747282+MagnusCrowe@users.noreply.github.com> commit 4792913 Author: FrontierATC <zuuswa@gmail.com> Date: Sat Jun 8 22:02:00 2024 +0000 Automatic Changelog (new-frontiers-14#1493) commit de69cf9 Author: Whatstone <166147148+whatston3@users.noreply.github.com> Date: Sat Jun 8 18:01:36 2024 -0400 Add wanted status, job icon, health icon to Brigmedic HUD (new-frontiers-14#1493) * Brigmedic HUD: inherit from NFSD HUD * Brigmedic: reparent under med & nfsd huds commit 73ecff4 Author: Dvir <39403717+dvir001@users.noreply.github.com> Date: Sat Jun 8 20:55:09 2024 +0300 Fix mech codes to stop AI abuse (new-frontiers-14#1492) * Fix Mechs * Update Content.Server/Mech/Systems/MechSystem.cs Was Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> * Update Content.Server/Mech/Systems/MechSystem.cs Sure Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> * Update Content.Shared/Mech/EntitySystems/SharedMechSystem.cs Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> --------- Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> commit a8c22c7 Author: FrontierATC <zuuswa@gmail.com> Date: Sat Jun 8 14:41:07 2024 +0000 Automatic Changelog (new-frontiers-14#1490) commit e9c2534 Author: AndresE55 <80334192+Leander-0@users.noreply.github.com> Date: Sat Jun 8 10:40:33 2024 -0400 Dropping Corpses Devoured by Space Dragons on Gib/Butcher. (#28709) (new-frontiers-14#1490) * Update DevourSystem.cs * Update DevourSystem.cs * Update Content.Server/Devour/DevourSystem.cs --------- Co-authored-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> commit 0ad77b4 Author: FrontierATC <zuuswa@gmail.com> Date: Fri Jun 7 21:53:26 2024 +0000 Automatic Changelog (new-frontiers-14#1305) commit 8342e26 Author: Dvir <39403717+dvir001@users.noreply.github.com> Date: Sat Jun 8 00:52:59 2024 +0300 Mail Truck (Update) (new-frontiers-14#1305) * Mail * Update mailtruck.yml * Update mailtruck.yml * Update mailtruck.yml commit de8a049 Author: FrontierATC <zuuswa@gmail.com> Date: Fri Jun 7 17:10:44 2024 +0000 Automatic Changelog (new-frontiers-14#1473) commit 53dd031 Author: Dvir <39403717+dvir001@users.noreply.github.com> Date: Fri Jun 7 20:10:14 2024 +0300 Mail Buff (new-frontiers-14#1473) * MailUp * Update base_mail.yml * Update base_mail.yml * Update MailTeleporterComponent.cs * Update MailComponent.cs * Update base_mail.yml * Update base_mail.yml * Update Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/base_mail.yml Sure Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> --------- Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> commit 7e0de7c Author: Hamblinius <Hammi@live.co.uk> Date: Fri Jun 7 16:35:20 2024 +0100 Brown Flat Cap in Loadouts (new-frontiers-14#1483) * Brown Flat Cap in Loadouts This PR adds the brown flat cap to the loadouts for the contractor, pilot, and mercenary. The grey flat cap is available in the loadouts but the brown one was conspicuously absent (and I need a cool hat that matches my outfit).   * Update stationrep_loadout_groups.yml --------- Co-authored-by: Dvir <dvirf01@gmail.com> commit 2eb75fe Author: SirMcSlushers <74610984+SirMcSlushers@users.noreply.github.com> Date: Fri Jun 7 10:59:47 2024 -0400 Nonlethal Vending Machine (Practice Rounds & Etc) (new-frontiers-14#1352) * Nonlethal Vending Machine (Practice Rounds & Etc) * Updated * Updated * Added the Restocking * Update meta.json * Cleanup * Update eject-unshaded.png * Fixup --------- Co-authored-by: Dvir <dvirf01@gmail.com> commit c8eee32 Author: FrontierATC <zuuswa@gmail.com> Date: Fri Jun 7 10:59:04 2024 +0000 Automatic Changelog (new-frontiers-14#1474) commit 4ebccb1 Author: Whatstone <166147148+whatston3@users.noreply.github.com> Date: Fri Jun 7 06:58:39 2024 -0400 Restore rubber rounds to nfsd techfab, r&d server (new-frontiers-14#1474) commit 7ed77cd Author: FrontierATC <zuuswa@gmail.com> Date: Fri Jun 7 09:53:41 2024 +0000 Automatic Changelog (new-frontiers-14#1445) commit 280e6be Author: Maxtone <124747282+MagnusCrowe@users.noreply.github.com> Date: Fri Jun 7 04:53:14 2024 -0500 Private Security Hardsuit and New Merc Loadout Options (new-frontiers-14#1445) * phase 1 * Suit and extra loadout options for merc * inhand update * Update mercenary_loadout_groups.yml * Update hardsuit-helmets.yml --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Dvir <dvirf01@gmail.com> commit d502a41 Author: FrontierATC <zuuswa@gmail.com> Date: Fri Jun 7 07:50:39 2024 +0000 Automatic Changelog (new-frontiers-14#1485) commit 74d4232 Author: Checkraze <71046427+Cheackraze@users.noreply.github.com> Date: Fri Jun 7 03:50:15 2024 -0400 mining crab and golem rebalance (new-frontiers-14#1485) commit 0dbdf75 Author: AndresE55 <80334192+Leander-0@users.noreply.github.com> Date: Thu Jun 6 18:39:08 2024 -0400 anchor trade station into place (new-frontiers-14#1484) commit 0e7107b Author: whatston3 <166147148+whatston3@users.noreply.github.com> Date: Thu Jun 6 02:23:33 2024 -0400 Non-lethal Mosin: inherit mag size from parent (new-frontiers-14#1479) commit c928f0f Author: FrontierATC <zuuswa@gmail.com> Date: Thu Jun 6 00:23:25 2024 +0000 Automatic Changelog (new-frontiers-14#1454) commit 5dbdb0c Author: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com> Date: Thu Jun 6 03:22:52 2024 +0300 Military Jumpsuits (new-frontiers-14#1454) * initial commit * update * fixes * loadouts * name change * fix * moved new jumpsuits behind T3 time lock commit 7f318fe Author: FrontierATC <zuuswa@gmail.com> Date: Thu Jun 6 00:19:36 2024 +0000 Automatic Changelog (new-frontiers-14#1468) commit f2a26be Author: whatston3 <166147148+whatston3@users.noreply.github.com> Date: Wed Jun 5 20:18:23 2024 -0400 Loadouts: fix Lawyer, Janitor slot names, remove Chaplain loadout (new-frontiers-14#1468) * Janitor, Lawyer, Chaplain NF loadouts * role_loadouts.yml: fix chaplain outer clothing * Remove chaplain loadout files, no job pref listing commit b4274c1 Author: FrontierATC <zuuswa@gmail.com> Date: Thu Jun 6 00:17:12 2024 +0000 Automatic Changelog (new-frontiers-14#1432) commit 6347758 Author: Dvir <39403717+dvir001@users.noreply.github.com> Date: Thu Jun 6 03:16:47 2024 +0300 PDA Bank Data (new-frontiers-14#1432) * Bank data * Data * Update Content.Client/PDA/PdaMenu.xaml.cs Co-authored-by: whatston3 <166147148+whatston3@users.noreply.github.com> --------- Co-authored-by: Checkraze <71046427+Cheackraze@users.noreply.github.com> Co-authored-by: whatston3 <166147148+whatston3@users.noreply.github.com> commit 2e94949 Author: Dvir <39403717+dvir001@users.noreply.github.com> Date: Thu Jun 6 02:53:15 2024 +0300 Canisters Sprites (Update) (new-frontiers-14#1409) * Canisters * Liquid * Update meta.json * Update gas_canisters.yml * Update meta.json * Fix * Create gas_canisters.yml * Update gas_canisters.yml * Update gas_canisters.yml commit 58f6678 Author: FrontierATC <zuuswa@gmail.com> Date: Wed Jun 5 23:49:21 2024 +0000 Automatic Changelog (new-frontiers-14#1466) commit 3df6203 Author: Maxtone <124747282+MagnusCrowe@users.noreply.github.com> Date: Wed Jun 5 18:48:58 2024 -0500 Trade Outpost (New POI) (new-frontiers-14#1466) * Trade phase 1 * Trade Phase 2, clean station * Phase 3 - new signs * Update whitelist.yml --------- Co-authored-by: Dvir <dvirf01@gmail.com> commit 0bdc032 Author: FrontierATC <zuuswa@gmail.com> Date: Wed Jun 5 23:29:54 2024 +0000 Automatic Changelog (new-frontiers-14#1316) commit c89fbf7 Author: Dvir <39403717+dvir001@users.noreply.github.com> Date: Thu Jun 6 02:29:28 2024 +0300 The Bird, the Vulp and the Un-Cloneable (new-frontiers-14#1316) * Vision filter accessibility option (new-frontiers-14#889) * Add option to disable vision filters * Remove DefaultVision in favor of the setting * Clean DeltaTab.xaml.cs * Fixing Vulps * Unclonable * Species vision fixes (new-frontiers-14#1150) Species vision fixes: no losing vision on nearby species vision haver getting gibbed, fix construction overlay * Update DCCVars.cs * Update OptionsMenu.xaml.cs * DeltaV * update * Update vulpkanin.yml --------- Co-authored-by: Debug <49997488+DebugOk@users.noreply.github.com> Co-authored-by: no <165581243+pissdemon@users.noreply.github.com> commit 517a3d0 Author: FrontierATC <zuuswa@gmail.com> Date: Wed Jun 5 23:27:46 2024 +0000 Automatic Changelog (new-frontiers-14#1391) commit 8c93948 Author: VividPups <150621839+VividPups@users.noreply.github.com> Date: Wed Jun 5 18:27:21 2024 -0500 Mosin Rework (new-frontiers-14#1391) * Testing? Mosin rework * Update snipers.yml * Update 2 * update 3 * Update snipers.yml * Update snipers.yml * Dumb updates updates do be dumb sometimes * WOULD THIS WORK? FUCK FUCK FU commit 652b8e9 Author: Checkraze <71046427+Cheackraze@users.noreply.github.com> Date: Wed Jun 5 19:23:48 2024 -0400 Mini Auth (new-frontiers-14#1465) * initial commit * IOC * no lists in toml * maybe * hm * dependent * undo * no tolerance * maybe no instantiate * double * maybe strings * patch * proper string handling * go back * redo * lets try this way eh * auth cmon * test logging * whoops * our own record * put it inside the if * eh * the worlds a stage * or not * hu * cleanup * rearrange the try catch to include the initial connection call as well * shorten it up try to simplify * no jack * locale commit 1622c31 Merge: c1b0601 41055f2 Author: GreaseMonk <1354802+GreaseMonk@users.noreply.github.com> Date: Thu Jun 6 00:54:00 2024 +0200 Merge pull request new-frontiers-14#1471 from dvir001/2024-06-05-FixIssues Argenti And Ammo Fixup commit 41055f2 Author: Dvir <dvirf01@gmail.com> Date: Thu Jun 6 00:44:13 2024 +0300 Update pistol.yml commit fe167fa Author: Dvir <dvirf01@gmail.com> Date: Wed Jun 5 01:35:06 2024 +0300 Fixing commit 2707d95 Author: Dvir <dvirf01@gmail.com> Date: Tue May 28 23:21:46 2024 +0300 Update HTNSystem.cs commit 1ba8f1e Author: Dvir <dvirf01@gmail.com> Date: Tue May 28 23:20:56 2024 +0300 Update HTNSystem.cs commit 18e6a82 Author: Dvir <dvirf01@gmail.com> Date: Tue May 28 01:24:11 2024 +0300 Update HTNSystem.cs https://github.com/FireNameFN/corvax-frontier-14/commits/bd773f58ceb5569c652a56077ad4ea8ea25b01a7/Content.Server/NPC/HTN/HTNSystem.cs
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About the PR
Restores rubber ammunition recipes to NFSD techfab. Adds recipes to non-lethal ammunition tech.
Why / Balance
Rubber rounds were brought back, but were left commented out of the NFSD techfab.
For the lathe recipe amounts, from previous amounts here, there were ratios of 1:1 and 2:1 plastic:steel, I settled on 2:1 and applied that onto the total materials required for lethal rounds of each type. Since plastic is considerably more expensive/difficult to obtain than steel, I think this might disincentivize its use.
How to test
Media
Breaking changes
None.
Changelog
🆑